Update docker #17598
Merged
Update docker #17598
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
|
There's a 27.3.1 Docker release in-progress, so we should give this a little time to pick that up 👀 |
Changes: - docker-library/docker@97331ed: Update 27 to 27.3.1 - docker-library/docker@fa5b615: Update 27 to compose 2.29.7
docker-library-bot
force-pushed
the
docker
branch
from
a7b228d
to
eb52719
Compare
Diff for eb52719:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 84413c5..d61d5e5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,33 +2,33 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 27.3.0-cli, 27.3-cli, 27-cli, cli, 27.3.0-cli-alpine3.20
+Tags: 27.3.1-cli, 27.3-cli, 27-cli, cli, 27.3.1-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 21b87062452c5525f054e46fb9dc998d0601bfb3
+GitCommit: 97331ed1dd7c07dd5aa852e01aa5deff5d2aed09
Directory: 27/cli
-Tags: 27.3.0-dind, 27.3-dind, 27-dind, dind, 27.3.0-dind-alpine3.20, 27.3.0, 27.3, 27, latest, 27.3.0-alpine3.20
+Tags: 27.3.1-dind, 27.3-dind, 27-dind, dind, 27.3.1-dind-alpine3.20, 27.3.1, 27.3, 27, latest, 27.3.1-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 21b87062452c5525f054e46fb9dc998d0601bfb3
+GitCommit: 97331ed1dd7c07dd5aa852e01aa5deff5d2aed09
Directory: 27/dind
-Tags: 27.3.0-dind-rootless, 27.3-dind-rootless, 27-dind-rootless, dind-rootless
+Tags: 27.3.1-dind-rootless, 27.3-dind-rootless, 27-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 21b87062452c5525f054e46fb9dc998d0601bfb3
+GitCommit: 97331ed1dd7c07dd5aa852e01aa5deff5d2aed09
Directory: 27/dind-rootless
-Tags: 27.3.0-windowsservercore-1809, 27.3-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
-SharedTags: 27.3.0-windowsservercore, 27.3-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 27.3.1-windowsservercore-1809, 27.3-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
+SharedTags: 27.3.1-windowsservercore, 27.3-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 21b87062452c5525f054e46fb9dc998d0601bfb3
+GitCommit: 97331ed1dd7c07dd5aa852e01aa5deff5d2aed09
Directory: 27/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 27.3.0-windowsservercore-ltsc2022, 27.3-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 27.3.0-windowsservercore, 27.3-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 27.3.1-windowsservercore-ltsc2022, 27.3-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 27.3.1-windowsservercore, 27.3-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 21b87062452c5525f054e46fb9dc998d0601bfb3
+GitCommit: 97331ed1dd7c07dd5aa852e01aa5deff5d2aed09
Directory: 27/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index a81df4f..78c84fc 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -12,16 +12,16 @@ docker:27.3-dind-rootless
docker:27.3-windowsservercore
docker:27.3-windowsservercore-1809
docker:27.3-windowsservercore-ltsc2022
-docker:27.3.0
-docker:27.3.0-alpine3.20
-docker:27.3.0-cli
-docker:27.3.0-cli-alpine3.20
-docker:27.3.0-dind
-docker:27.3.0-dind-alpine3.20
-docker:27.3.0-dind-rootless
-docker:27.3.0-windowsservercore
-docker:27.3.0-windowsservercore-1809
-docker:27.3.0-windowsservercore-ltsc2022
+docker:27.3.1
+docker:27.3.1-alpine3.20
+docker:27.3.1-cli
+docker:27.3.1-cli-alpine3.20
+docker:27.3.1-dind
+docker:27.3.1-dind-alpine3.20
+docker:27.3.1-dind-rootless
+docker:27.3.1-windowsservercore
+docker:27.3.1-windowsservercore-1809
+docker:27.3.1-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 900fab7..7ad28a5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-docker:27.3.0-cli-alpine3.20
+docker:27.3.1-cli-alpine3.20
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
-docker:27.3.0-alpine3.20
+docker:27.3.1-alpine3.20
docker:dind-rootless
diff --git a/docker_27.3.0-alpine3.20/Dockerfile b/docker_27.3.1-alpine3.20/Dockerfile
similarity index 97%
rename from docker_27.3.0-alpine3.20/Dockerfile
rename to docker_27.3.1-alpine3.20/Dockerfile
index bc653e0..991bbb7 100644
--- a/docker_27.3.0-alpine3.20/Dockerfile
+++ b/docker_27.3.1-alpine3.20/Dockerfile
@@ -61,16 +61,16 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_27.3.0-alpine3.20/dockerd-entrypoint.sh b/docker_27.3.1-alpine3.20/dockerd-entrypoint.sh
similarity index 100%
rename from docker_27.3.0-alpine3.20/dockerd-entrypoint.sh
rename to docker_27.3.1-alpine3.20/dockerd-entrypoint.sh
diff --git a/docker_27.3.0-cli-alpine3.20/Dockerfile b/docker_27.3.1-cli-alpine3.20/Dockerfile
similarity index 85%
rename from docker_27.3.0-cli-alpine3.20/Dockerfile
rename to docker_27.3.1-cli-alpine3.20/Dockerfile
index bb56d83..7c6ecf1 100644
--- a/docker_27.3.0-cli-alpine3.20/Dockerfile
+++ b/docker_27.3.1-cli-alpine3.20/Dockerfile
@@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
RUN set -eux; \
addgroup -g 2375 -S docker
-ENV DOCKER_VERSION 27.3.0
+ENV DOCKER_VERSION 27.3.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.29.6
+ENV DOCKER_COMPOSE_VERSION 2.29.7
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64'; \
- sha256='cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64'; \
+ sha256='383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6'; \
- sha256='3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv6'; \
+ sha256='10ee0856a65f5b5aa0e2d5711ffd61b20f7dddc5c1b5eafe81bb7e9699898c9f'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7'; \
- sha256='0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv7'; \
+ sha256='2aadddeee7cc43ff9f9bac4a096c1310b65d1a4543a0ae2f1bfdc725534f9725'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64'; \
- sha256='fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-aarch64'; \
+ sha256='6e9fbd5daa20dca5d7d89145081ae8155d68ef2928b497d9f85b54fe0f9dbb2c'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le'; \
- sha256='d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-ppc64le'; \
+ sha256='ad83e20755fcf6ff53da61fd42602ec3224588172f4345bc926bc3521f36d513'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64'; \
- sha256='a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-riscv64'; \
+ sha256='6230041e4805a28d1f7e16a9c3f6ccee4f880ecdd7eec7abbbd97f14a2ad4718'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x'; \
- sha256='b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-s390x'; \
+ sha256='4d5481de21f929a9403a8186de85184bb4bea3ff8e825c92329f4e98a5b07f72'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_27.3.0-cli-alpine3.20/docker-entrypoint.sh b/docker_27.3.1-cli-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from docker_27.3.0-cli-alpine3.20/docker-entrypoint.sh
rename to docker_27.3.1-cli-alpine3.20/docker-entrypoint.sh
diff --git a/docker_27.3.0-cli-alpine3.20/modprobe.sh b/docker_27.3.1-cli-alpine3.20/modprobe.sh
similarity index 100%
rename from docker_27.3.0-cli-alpine3.20/modprobe.sh
rename to docker_27.3.1-cli-alpine3.20/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 002b09c..7cd245d 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -24,10 +24,10 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index 33d9ab2..32a9f4c 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_windowsservercore-1809/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV DOCKER_VERSION 27.3.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.zip
+ENV DOCKER_VERSION 27.3.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.zip
# TODO ENV DOCKER_SHA256
# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
# (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.29.6
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1
+ENV DOCKER_COMPOSE_VERSION 2.29.7
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \
diff --git a/docker_windowsservercore-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index ad70538..4554c61 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2022/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV DOCKER_VERSION 27.3.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.zip
+ENV DOCKER_VERSION 27.3.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.zip
# TODO ENV DOCKER_SHA256
# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
# (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.29.6
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1
+ENV DOCKER_COMPOSE_VERSION 2.29.7
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \Relevant Maintainers: |
tianon
approved these changes
Sep 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: